Merge "Avoid IPC onStartedWakingUp" into main