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

* commit '71561909a517b3f61f0a638fdeb2e262b38e8df9':
  TabLayout improvements + fixes