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

Change-Id: I31a2a124ba95c47ac056aa07be14f2bc64ecad1d