Merge a set of changes which run the OpenGL video updates in a separate