Merge "Revert^2 "SF: Set an initial mode [...] for external displays"" into main