Merge "New window for drawing debug overlay" into main