Merge pull request #22574 from gmarty/Bug-1042105-Icon-prioritization-Dual-Status-bar

Bug 1042105 - [User Story] Icon prioritization in the status bar
Merge pull request #23004 from mikehenrty/bug-1042105-reland-icons

Merge pull request #22574 from gmarty/Bug-1042105-Icon-prioritization-Du...