Merge "Fix WindowRenderSurface crash" into devel/master