Merge "Dispatch onControllerUpdated() when route updates affect selected routes" into main