Merge pull request #9675 from dominickuo/davidflanagan-bug870584

Bug 870584 and Bug 870587: minor tweaks to the open activity save ux, r=@dominickuo(cherry picked from commit 1fc127e4af12a7a158fa1b975a1de18d147947f2)
Merge pull request #9685 from davidflanagan/bug870584-v1-train

Merge pull request #9675 from dominickuo/davidflanagan-bug870584