am 0067057c: Merge change 9035 into donut

Merge commit '0067057c31720f64926d6ee3d841b15dc197d2df'

* commit '0067057c31720f64926d6ee3d841b15dc197d2df':
  Fix the TabWidget to display custom views for the tabs better when the tabs have different sizes.