Merge "More TabLayout fixes" into lmp-mr1-ub-dev