Merge "SnapdragonCamera: Fix FC for NullPointerException" into camera.lnx.1.0-dev.1.0