Merge changes from topic "dnd_touch_sounds" into pi-dev

* changes:
  DND touch sounds toggle does not toggle vibrations
  Charging sounds won't play when dnd is on