Merge "Camera: Fix double-free in removeCamera" into sc-dev