Merge "Camera: Add @2.6::ICameraProvider to current.txt"