Merge "Fix Settings test that uses OverlayInfo"