am 7c669f45: Merge "Revert "Work around inconsistent views in...
am 7c669f45: Merge "Revert "Work around inconsistent views in RelativeLayout.onMeasure()"" into mnc-dev
* commit '7c669f45':
Revert "Work around inconsistent views in RelativeLayout.onMeasure()"