Merge "Create test display and window only if needed"