Merge "VolumeShaper: Ensure consistent observable state when muted" into qt-dev
am: 2616bbf488

Change-Id: I4a3f50d64f9cee6cc6fcfeab88967bd3b14252bb