Merge "Account for margins in ScrollView onMeasure() when filling viewport" into mnc-dev