Backed out changeset b2ef6a444640 (bug 1046554) since the gaia part has been reverted
Backed out changeset b8c53e689955 (bug 1042651) because it depends on the patch from bug 1046554 which was backed out.
Merge m-c to b2g-inbound.
Bug 1042651 - B2G NFC: getNFCPeer and getNFCTag should not throw error. r=smaug, r=allstars.chh, a=me
Bumping manifests a=b2g-bump
Bumping gaia.json for 6 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/aa934b827342
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #22501 from pivanov/bug-1037606

Bug 1037606 - The placeholder text shown when the list of contacts is empty is left aligned in RTL mode

========

https://hg.mozilla.org/integration/gaia-central/rev/90b0ffacd479
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 1037606 - The placeholder text shown when the list of contacts is empty is left aligned in RTL mode

========

https://hg.mozilla.org/integration/gaia-central/rev/893149213746
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #22502 from pivanov/bug-1037607

Bug 1037607 - The drop-down fields in the add contact dialog are left aligned

========

https://hg.mozilla.org/integration/gaia-central/rev/46944f3c88fb
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 1037607 - The drop-down fields in the add contact dialog are left aligned

========

https://hg.mozilla.org/integration/gaia-central/rev/17f156ed4f0a
Author: vingtetun <21@vingtetun.org>
Desc: Merge pull request #22586 from vingtetun/system.dialog.size2

Bug 1047411 - Firefox Accounts UI misplaced. r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/8938b405f3ba
Author: Vivien Nicolas <vnicolas@mozilla.com>
Desc: Bug 1047411 - Firefox Accounts UI misplaced. r=alive
Bumping manifests a=b2g-bump