Merge "Catch all exceptions in onFrameDraw" into qt-dev