Merge "Camera: Avoid possible instability when adding new devices" into sc-v2-dev