Merge "Fix locking for mMasterVolume and mMute"