Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev