Switch to GalleryNext and CameraNext instead of Gallery2 and Camera2