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