Merge pull request #6407 from leoetlino/master Fix render surface when using Render to Main and debugger (regression fix)