Merge "Correct grantFocusToPostion logic" into main