Merge "Don't apply UI width limitation to an external display" into main