Merge pull request #9549 from davidflanagan/bug867231

Bug 867231 - add a Save button to the Gallery Open activity r=dkuo(cherry picked from commit ad01e40314fb800493e3865912b107b96664836b)
Merge pull request #9654 from davidflanagan/bug867231-v1-train

Merge pull request #9549 from davidflanagan/bug867231