Merge "Fix kernel wakeup durations" into main