Merge "Comparing dimension and rotation instead of DisplayInfo" into qt-dev