Merge "DO NOT MERGE Make mute/unmute work" into lmp-mr1-dev