Merge "Force measurement in LinearLayout if any views are skipped"