Merge "Fixes to idle alarm scheduling, package importance."