Merge "Flag to mark foreground jobs, fix data saver." into nyc-dev