VideoGalleryActivity updated
merge changes in VideoGalleryActivity