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

Change-Id: I95eaefecbcd1c91e099ab40acf772cc0d7c8b605