Merge "Camera: Fix a removal-while-iterate bug" into rvc-qpr-dev