Merge "Camera: Fix potential null pointer dereference issues" into main