Revert "Merge remote-tracking branch 'remotes/origin/MP1-4247-BUG-Wave_volume_settings_has_Mute_Unmute_issue'"

This reverts commit 998b4753273c28ff4da79d184cb2960656bf2e8a, reversing
changes made to b7d978124fea82e11eed1005827cd8684fa5f989.