Merge "AudioFlinger: Better handling for master volume/mute" into jb-mr1-dev