After applying the patch to revert the commits, hw cursor works fine. Feel free to close as resolved. Thanks!