Merge "Merge "Protect autofill UI against redressing" into oc-dev am: 0541862ec5 am: fa6b5ac317 am: 984f1be505"