Merge "Fix augmented autofill UI."