Bug 940412 - Augmenting the delay when forging a "tap" from the
EdgeSwipeDetector.
Bug 939971 - [SMS] SMS are cut if you switch App while writing your text message r=schung

* Never add an empty text in the content array
* Remove old code that is not used anymore
Bug 866907: Settings UI Implementation.

- NFC UI enable/disable
- Airplane mode implementation.
Bug 936565 - Use default symbols layout in the pt-BR keyboard. r=djf
Bug 940883 - Fix test_everythingme_add_collection.py
Bug 883767 - [Email] Unsupported encoding in some email makes the email client explode. r=asuth

propagate https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/262
Merge pull request #13850 from svic/rebase-master-41c3fd86-SettingsUI

Bug 866907: Settings UI Implementation, r=evelyn
Merge pull request #13864 from asutherland/encoding-explosions

Bug 883767 - [Email] Unsupported encoding in some email makes the email client explode. r=asuth
Merge pull request #13846 from julienw/939971-sms-are-cut

Bug 939971 - [SMS] SMS are cut if you switch App while writing your text...
Merge pull request #13863 from askeing/940883

Bug 940883 - Fix test_everythingme_add_collection.py
Bug 935319 - Improve gaia-ui-tests documentation for users getting starting with b2g-desktop builds. r=dhunt
Bug 940966 - [Download Manager] [DownloadFormatter] The field started is startTime in the API
Bug 937630 - All you need is ... smooth unlock transition
Merge pull request #13868 from crdlc/bug-940966

Bug 940966 - [Download Manager] [DownloadFormatter] The field started is...
Bug 937668 - [e.me][peak] peak icons/text are too big on everything me [r=crdlc, amirn]
Merge pull request #13867 from timdream/lockscreen-unlock-transition3

Bug 937630 - All you need is ... smooth unlock transition, r=vingtetun
Merge pull request #13871 from EverythingMe/937668-text-size

Bug 937668 - [e.me][peak] peak icons/text are too big on everything me [r=crdlc, amirn]
Bug 937205 - [B2G][Contacts] Contact picture does not display after Linking and Favoriting a Facebook contact
Bug 915672 - Modify marionette test driver scripts to add support for gathering power draw data. r=dhunt r=jgriffin
Merge pull request #13839 from etiennesegonzac/bug-940412-sendtap-delay

Bug 940412 - Augmenting the delay when forging a "tap" from the EdgeSwipeDetector. r=vingtetun