Merge "camera: add support for camera removal"