am 034ca4f6: Merge "Adds a check for that the FOV is the same before takePicture() and in onPictureTaken()." into jb-mr2-dev

* commit '034ca4f69f5ac9e1a8671c053c6c13370478e645':
  Adds a check for that the FOV is the same before takePicture() and in onPictureTaken().