Merge "Fix issue #29371078: Foreground jobs should not count..." into nyc-dev