Merge "Revert^2 "Mark nativeWake as CriticalNative."" into main