Merge "Explicitly expose native_headers" into main