Merge "Camera: update eviction logic for same owner case" into rvc-dev