Merge "Bug 4382356: No automatic focus change in ScrollViews"