am 9e981d83: am d44a1686: Merge "Don\'t draw onto a hw surface using the...
am 9e981d83: am d44a1686: Merge "Don\'t draw onto a hw surface using the software renderer Bug #6485955" into jb-dev
* commit '9e981d83':
Don't draw onto a hw surface using the software renderer Bug #6485955