Merge "More work on issue #26390151: Add new JobScheduler API..." into nyc-dev