Merge "Remove init-time GLES per-frame callback"