Merge "Fix race in inflating thin locks."