Merge "camera: Fix NPE in FOV test" into jb-mr2-dev