Merge "Always distribute excess space in LinearLayout measurement" into mnc-dev