Merge "Make waiting for blocking GC more intuitive"