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

Change-Id: I485cc8af4e6180adebb31235b43191e467b393bc