Merge "Set the focused item positin in the cursor" into main