Merge "Block dual display when an external one is added" into main