MP1-4247 : Make the code clearer.
Merge remote-tracking branch 'remotes/upstream/MP1-4247-BUG-Master_Wave_volume_settings_has_Mute_Unmute_issue_Win8' into 1.5.0Fork