Bug 822931 - Maps app asks you to bookmark to the homescreen erroneously
Merge pull request #7309 from vingtetun/822931

Bug 822931 - Maps app asks you to bookmark to the homescreen erroneously
Bug 804402 - Contacts with Company name but no first or last name are sorted by phone number, not Company name

Also remove a redundant call to async_storage.js