Merge "Fix possible deadlock in incoming call" into rvc-dev