Merge "Revert two changes to LinearLayout measurement" into mnc-dev