Merge "Allow using display port for window settings"