Merge "TabLayout improvements + fixes" into lmp-mr1-ub-dev