Merge "Ensure we discard unneeded renderbuffers in OpenGL ES 2.0 as well" into devel...