Merge "Refresh mFilteredRoutes when routes are changed" into rvc-dev