Merge "Camera: add proper nullptr check" into oc-dr1-dev
am: 4b5215993a

Change-Id: I326e2ded58282529a58df7091b4124531dcf1e7a