am bf7b41ff: Merge "Fix concurrent GC ergonomics"

* commit 'bf7b41ff04e5cf70660b50f7b7f2c14d94b8bf6d':
  Fix concurrent GC ergonomics