Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev