Merge "RESTRICT AUTOMERGE Ensure caller identity is restored in CP quick-path." into qt-dev