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

Change-Id: Iffbafcce1d41b42e60c1c194a7e66d56c1c9e866