Merge "Fixes JobScheduler not persisting flex and sourcePackage" into nyc-dev