Merge "Make sure frame buffer 0 is bound before calling GL functor" into pi-dev