am 6ca28414: Merge "Make TabLayout more customizable" into lmp-mr1-ub-dev

* commit '6ca2841444fa47edede00296d09f21dde6de2f39':
  Make TabLayout more customizable