Merge "Camera: Fix null pointer access"