Merge "Fix PlaybackActivityMonitor unmute path"