Merge "Camera: Fix a crash in removeCamera()"