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