Merge "More cleanup after removing the Cursor update logic."