Merge "Don't call startRinging twice" into rvc-dev