Merge "Extract TestDisplayWindowSettingsProvider class" into main