Merge "Fix the timestamp from notifier to WakelockLogs" into main