Merge "Improve checkpoint_gc jank and logging"