Merge "Draw in the correct FBO after invoking a GL functor Bug #5650514" into ics-mr1