Merge "Fix unmuting both cam and mic at the same time" into sc-dev