Merge "Make JobRunner flush DeferredUpdates after each job"