Merge "Fix NPE in JobServiceContext when closing job."