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