Merge "Don't crash on makeCurrent fail" into mnc-dev