Merge "Add main thread and reentrant asserts to chase down crashes" into qt-dev