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

Change-Id: Iedbd9549e754bb2884f447e3d964b9601e9161e5