Merge "Makes CombinedCursor sync aware"