Merge "Don't save ScrollView/HorizontalScrollView saved state for old apps"