Merge "Retire CbManager from camera"