Bug 870584 and Bug 870587: minor tweaks to the open activity save ux

This PR is cherry-picked from djf's repository.