Bug 946176 - [e.me][Bug] Collections Tapping issues [r=evyatar]
Bug 935860 Remove the "sendString" method from Korean IME
Bug 925398 - Refactor runtests.py to follow Mixin pattern
Bug 944749 - [Settings][l12y] Use different labels for menu items and headers

Don't reuse labels in different contexts (and with different space available).
Use fallback to original string for headers ({{id}}) to reduce impact on existing localizations.
Bug 946047: Add nfc read only permissions to Settings UI to allow navigator.mozNfc DOM to be created.

This fix is needed for apps using NFC if "HasNfcSupport" is added to the navigator MozNfc WebIDL.

Conflicts:
	apps/settings/manifest.webapp
Bug 948811 - Remove HTML in comments
Bug 937251 - [Cost Control] Remove proxy
Bug 924843 - Icons on grid do not re-arrange automatically when dragging over collections
Fix indent
Bug 948862 - [Contacts] The first time exporting a contact to SIM creates a duplicate of the contact in the contact list
Bug 948385 - Merge test_set_alarm_repeat, test_set_alarm_snooze, test_set_alarm_sound.py
 Bug 888253 - Settings data migration for keyboard layouts
Revert "Merge pull request #14529 from jaoo/933203"

This reverts commit 4dd40d64f137c48104d5f39e48c2ccb0ce9ab78c, reversing
changes made to 0985280ffc917353eb34ff7b0dcc1c152856450c.

This is breaking unit tests:
[system] system/LockScreenConnInfoManager > Single sim devices "before each" hook:
TypeError: MockNavigatorMozIccManager.addIcc is not a function
Merge pull request #14476 from malini/mixin

Bug 925398 - Refactor runtests.py to follow Mixin pattern, r=davehunt
Bug 948852 - Fix the event creation error
bump marionette-client and gaiatest versions, enable gaia-ui-tests
Bug 948346 - MMS when message has multiple lines, it cuts off
Bug 948396 - [Calendar] Can not scroll anymore the week/day view once the new event has been opened with APZ turned on. r=kgrandon
Bug 942854 - [Calendar] Scrolling the week view results into results into overlapping artifacts. r=kgrandon
Bug 948001 - [Settings] With APZ turned on the wifi panel is sometimes shown instead of the main panel at startup. r=arthurchen