Merge "Camera: Fix typo when comparing display size height" into qt-qpr1-dev am: 870f67cc63

Change-Id: I74bd4ba4084d10f5e8ea866cc06799c52372e10e