Merge "Compute size range before setting DisplayInfoOverride" into qt-dev