Merge "Camera: Use area to check against 1080p size" into tm-qpr-dev