Merge "Add idle-state controller for the Task Manager"