Merge pull request #8446 from lightsofapollo/calendar-async-accounts-and-calendar-stores

Bug 816610 - Calendar async accounts and calendar stores...(cherry picked from commit cbc741d01d43b781178d3a2a4e7df43d9fed6da6)