Merge "Fix "holding ThreadListLock while doing condition variable wait on HeapLock"" into ics-mr1-plus-art