Merge "Fix bug 3052686 - ScrollView padding treated incorrectly" into gingerbread