Merge "Revert "Fixed placemente of Autofill UI for virtual views."" into oc-dev