Merge "Fix for JobScheduler jobs not running" into nyc-dev