Merge "Ensure we start every frame in the proper GL state Bug #6345013, #6314960" into jb-dev