Merge "Fix Autofill Inflating as User 0" into main