Merge "Initial fix on Autofill for visible background users." into udc-dev