Merge "Fix propagation of RouteDiscoveryPreferences active scan flag"