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