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