Merge "Fixed SaveUi on Autofill for visible background users." into udc-dev