Merge "Support legacy routes added by apps via ensureRouteToHost()."