Merge pull request #9632 from davidflanagan/bug869292

Bug 869292: add a save option to video app open activity r=dkuo(cherry picked from commit f02b2b29fbffe38f9a05fc53b16dc97049a9d55d)
Merge pull request #9655 from davidflanagan/bug869292-v1-train

Merge pull request #9632 from davidflanagan/bug869292