Merge "SF: Adding Idle Timer, to detect when devices are idle."