Merge "fix potential audio flicker w/ CS outgoing calls" into main