[automerger skipped] Merge "Camera: Fix typo when comparing display size height" into qt-qpr1-dev am: 870f67cc63 am: 162fb37428 -s ours
am skip reason: Change-Id I588fd3b331380ff20762c24762e997d4a878cc44 with SHA-1 8649a91686 is in history

Change-Id: I1860aac732bbdf9dc1cdafdc919e33c3913ec3d4