CameraNext 2.0.004 & GalleryNext 1.0.2

Change-Id: Icbc5eaf523137e8709a868a0a4137db14826b748