Merge "Don't draw onto a hw surface using the software renderer Bug #6485955" into jb-dev