Merge "Fix lock ordering in JobScheduler" into lmp-dev