add back camera2 and gallery2