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

* commit '599287b14d32bbe6b5eea4e610cc14d8224362b6':
  Don't crash on makeCurrent fail