Merge "Cancel notification when mic/cam is unmuted" into main