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

Change-Id: Icd452fb2132ffd98fe65ee5951f727e41a37f40b