Merge "Merge "Closes Autofill UIs when back button is pressed." into oc-dev am: 8db14809 am: b32c05a3 am: 768bfff3"