Merge "Comparing dimension and rotation instead of DisplayInfo" into qt-dev am: 50ab7b076d am: e041e62324
am: 1f87a4ef70

Change-Id: I19a8f20af4aebdad4ad0cc15c07248373065b804