Merge "Camera: fix new device register logic" into oc-dev