Merge "Camera: Advertise only unique API1 compatible devices" into oc-dev