am 42cc892b: Merge "Account for margins in ScrollView onMeasure() when filling...
am 42cc892b: Merge "Account for margins in ScrollView onMeasure() when filling viewport" into mnc-dev
* commit '42cc892b':
Account for margins in ScrollView onMeasure() when filling viewport