Merge "Camera: Fix typo when comparing display size height"