Merge "Code clean-up around ScrollView."