Merge changes from topic "toast-polish" into tm-mainline-prod

* changes:
  [automerge] [Toast] Polish the layout of the QSB, tabs and header protection. 2p: a5e95419f5
  [Toast] Polish the layout of the QSB, tabs and header protection.