Merge "Fixed autofill compat mode so it works on secondary user." into pi-dev