Merge "Fix smart zoom for plugins that use OpenGL." into honeycomb