Merge "camera: fix two potential null pointer uses"