Merge "Exclude headless packages from being scanned as stopped." into udc-dev