Merge "Fix cross-process cursor logic."