Merge "Move device idle logic into a job StateController" into nyc-dev