Merge "Remove @CriticalNative annotations" into main