Merge changes from topic "grouped-volume-tweak" into sc-v2-dev

* changes:
  Re-enable volume control for non-grouped devices
  Tweak volume adjustment rules