Merge "Add main thread and reentrant asserts to chase down crashes" into qt-dev am: 4d39c4a7d7
am: e7ace65916

Change-Id: I27635277c6ca2be0215c49766b60171cc770ef41