Merge "TimedEventQueue takes a wake lock" into klp-dev