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

Change-Id: Ib741ea151a0466d69520ee79bab0ed448ba112fe