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