am 43b123c1: am 42cc892b: Merge "Account for margins in ScrollView onMeasure() when filling viewport" into mnc-dev

* commit '43b123c134f7496ee83308748978e0fea2c2d4c6':
  Account for margins in ScrollView onMeasure() when filling viewport