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

Change-Id: I2da5801f3b6846410fc592ddaa03b9be0fb9df2c