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