Merge "Add CTS tests for changes to ScrollView."