Merge "Fix RootScanner to execute scan at least once before cancelling it." into nyc-dev