Merge changes from topic "presubmit-am-2a57cf6b59364104b426c1cc5809724d" into tm-mainline-prod

* changes:
  [automerge] Add logic to show all status bar icons. 2p: ea7cb6fd68
  Add logic to show all status bar icons.