Merge pull request #11161 from huchengtw-moz/media/Bug_891797-2

Bug 891797 - [OTA][Data Migration][MediaDB] Data of Gallery, Video, and ...r=djf(cherry picked from commit ccf877b99ace72e621eb5172f042c6c20aa1297a)

Conflicts:
	apps/gallery/js/gallery.js
	apps/gallery/locales/gallery.en-US.properties

(cherry picked from commit c96a889ca4e23529fcdcdba387a00fa09f67ca8c)