Merge "Camera: Use default focal length in template to derive FOV" into pi-dev