Disabling "Displays Have Separate Spaces" in Monitor Control fixes the OP problem of display recovery after switching monitoring configuration/sources.