Merge change 9035 into donut

* changes:
  Fix the TabWidget to display custom views for the tabs better when the tabs have different sizes.