Merge "Revert^2 "displaycolor: Add support for external displays"" into main