Merge "Fix interaction of VMInit and ThreadStart events."