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

Change-Id: Ic222d2021027e4a7f4350c4a8253c0b2d1041f4c