Merge "Use Consumer for RouteListingPreference callback instead of SAM" into main