Merge "Camera: Pass physical camera device id during errors"