Merge "Remove GLES2Renderer dependency on config stores"