Merge "RouteDiscoveryPreference: Filter out null/empty values" into rvc-dev