Merge "Make TabLayout more customizable" into lmp-mr1-ub-dev