Merge "Eliminate requireGlContext" into mnc-dev