am 5dd24d89: Merge "Move GC daemon locking logic into heap"

* commit '5dd24d89714aeca69a3a06561d5a3687d54cf43b':
  Move GC daemon locking logic into heap