Merge "Fix non concurrent mark sweep ergonomics."