Merge "Fix up AutoFill profile editor UI in portrait mode"