am f0f36370: Merge "Re-measure tab width after max width is decided"

* commit 'f0f363707e53c83688ee66a029885685de398dd0':
  Re-measure tab width after max width is decided