FED-3159 Fix required prop null-safe-conditional linting

FED-3159 Fix required prop null-safe-conditional linting #1338