Merge "ListView now tries to keep the position containing focused child views on-screen."