Fix WebActivity activation of email: use WebAPI state, and remember activity for activation after new account setup
Merge pull request #8390 from jrburke/bug843768-activity

Bug 843768: Email: Fix WebActivity: use WebAPI state, and remember activity. r=asuth
Merge branch 'master' into groupload