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

Change-Id: Ib1591c101235b0f2cc51e20df7560179947f1fc6