Merge "Add missing EndAssertNoThreadSuspension"