Merge "Fix the ordering of lock acquisition in the heap worker."