Merge "Undo the jobscheduler / device idle initialization with callbacks"