Merge "Fix for possible NPE in JobScheduler"