Merge "Fix DisplayWindowSettingsTest to restore overscan settings"