Merge "Revert "Work around inconsistent views in RelativeLayout.onMeasure()"" into mnc-dev