Merge changes Iaf63b4e8,Ie76044d4 into pi-dev

* changes:
  Change DND upgrade noti text and channel
  Reevaluate volume settings toggle onShow.