Bug 898304 - [Contact] Import from gmail shows null when the contact does not have name
[Bug 923445] Align grid icons on first page [r=crdlc]
Bug 923467: notifyAboveTheFold() when no contacts
Bug 914191 - [Contacts] Import contacts from SD card make phone not enter sleep.
[Bug 903405] [E.me][L10n] After changing language,
the description in e.me should change [r=crdlc]
Merge pull request #12656 from arcturus/bug-914191

Bug 914191 - [Contacts] Import contacts from SD card make phone not enter sleep.
Merge pull request #12651 from wanderview/contacts-notify-empty

Bug 923467: notifyAboveTheFold() when no contacts
Merge pull request #12645 from EverythingMe/923445-grid-icons-alignment

[Bug 923445] Align grid icons on first page [r=crdlc]
Merge pull request #12639 from jmcanterafonseca/fix_gmail_import_name

Bug 898304 - [Contact] Import from gmail shows null when the contact doe...
bug 917582

-OperatorVariantHelper error when IccHelper.enabled == false should be more descriptive since it is an expected error when running in b2g desktop or fxos simulator.
-Do not throw when IccHelper is undefined, it only indicates that the feature was omitted in the build

r=dflanagan
Merge pull request #12453 from nullaus/bug917582-operator-variant-console

bug 917582 - OperatorVariantHelper error when IccHelper.enabled == false...
Revert "Merge pull request #12656 from arcturus/bug-914191"

This reverts commit 12d41a0c09531ac8b527b71edaa4daada7b08e9d, reversing
changes made to 79cc970a9aca9c1f0888c70b60687b87a8871c32.

Conflicts:
	apps/communications/contacts/test/unit/mock_wakelock.js