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

Change-Id: I2378d0c6dea0fb3731e7a33a350775470f6bb9f1