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

Change-Id: I394325bd763912c70a923e44ca2688eb0dc23cd4