Merge "Work on issue #20401752: device idle and alarms."