Merge "Add Paint methods for cursor positioning"