Merge "Catch all exceptions in onFrameDraw" into qt-dev
am: cff24b878d

Change-Id: If3aef1ccbba89a4b0964749ee3184a83f88185be