am 6fff1f92: Merge "Fix TabLayout when used in a HorizontalScrollView" into lmp-mr1-ub-dev

* commit '6fff1f920e152a0504d9ae745a0bfbc926a8e4c1':
  Fix TabLayout when used in a HorizontalScrollView