Merge pull request #8480 from davidflanagan/bug846220

Bug 846220 - don't leave edit mode when handling the browse activity r=jhylands a=tef+(cherry picked from commit 28276e469cb7f9ee8abdb09fe84189bb9898f2f7)

Conflicts:

	apps/gallery/js/gallery.js