Merge "Camera: allow shifted camera metadata for some interface" into oc-dev