Merge "Fix bug with broadcasting the wrong audio state"