am ba4f0757: Merge "Don\'t crash on makeCurrent fail" into mnc-dev

* commit 'ba4f0757779d6e91e52ebee0fd4c847b673a69e2':
  Don't crash on makeCurrent fail