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

Change-Id: I39c037dd0b53d93c3a88eaa18e7bee26a12cb47a