Merge "SnapdragonCamera: Fix NP when mValuesMap is Null" into camera-SnapdragonCamera.lnx.2.0