Merge "Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND." into nyc-dev