Merge "Defer client visibility update when calculating new config" into pi-dev