Merge "Use correct param for heightMode in RelativeLayout horizontal measure"