Merge "Fix consistency in nested pre-scroll with ScrollView for AbsListView"