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

Change-Id: Icc245a07ca723cce71263002a2e613f7c52f227d