Merge "Revert "Add Mute custom quick affordance"" into tm-qpr-dev