Merge "Exempting time-tick from device-idle"