Merge "Refresh terminal instances when switching between SS and DS"