Merge changes I3fc38158,Ied8e53c2 into main

* changes:
  (Almost) display active priority mode icon in status bar
  Prepare the way for showing the active Priority Mode icon instead of the DND icon