* commit '42f9a5a6b74211b10927d8e95a04cd6a80efdd6d': Revert "Revert "Work around inconsistent views in RelativeLayout.onMeasure()""
* commit '42f9a5a6b74211b10927d8e95a04cd6a80efdd6d': Revert "Revert "Work around inconsistent views in RelativeLayout.onMeasure()""