Merge "Fix TabLayout when used in a HorizontalScrollView" into lmp-mr1-ub-dev