Merge "Fix display settings loss: consider all possible DisplayInfo." into main