Merge "Fix NPE and turn on logging for device-idle alarms" into sc-dev