Merge "TimedEventQueue: improve wakelock management" into klp-dev