Add back Focal and swap out gallery/camera repos for CM's. Only Gallery2 gets used but we will add the others as well.