am cdc70209: am 16627347: Merge "Enable mipmapping, without a deadlock this time Bug #7353771" into jb-mr1-dev

* commit 'cdc702093cc807237979f14776e75ffdba869ba6':
  Enable mipmapping, without a deadlock this time Bug #7353771