Merge "Revert "Unify and clarify divergent flows e.g. where augmented autofill or""