Merge "Update cursor placement for handwriting initiation" into main