Merge "Fix cursor stopping at off-by-one position on WearOS"