Merge "Switching overlays more correctly" into sc-dev