Merge "Fix rect convert from screen to surface coordinates with scaling"