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

Change-Id: Id870e075aaad71c78793d2f19397fb59fec06ce7