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

Change-Id: Ia035a3156a1d782aaf2ee4bae5681a04df917255