Merge "Properly restore the GL scissor after a GL draw functor Bug #5781254"