Camera2 is once again separate from Gallery2