Merge "Convert NSSL debug props to FeatureFlags"