Merge "Remove OpenGL traces from dev settings" into nyc-dev