Merge "Use integer coordinates as the cursor starting point on a display" into main