Merge "Fix wrong position of cursor in OwnerInfoSettings"