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