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

Change-Id: I74089f0cf71ca2c3dc917001eb14dca8586396e0