Merge "Ensure caller identity is restored in CP quick-path." into rvc-dev