Merge "Merge "Closes Autofill UIs when back button is pressed." into oc-dev am: 8db148093c am: b32c05a36a am: 768bfff308"