Bug 882053 - Content channel triggers silent mode incorrectly.
Bug 876340 - Fix active channel during and after ftu running on v1-train
Merge pull request #10380 from alivedise/bugzilla/882053_v1-train/content-channel-should-trigger-vibration-mode

Bug 882053 - Content channel triggers silent mode incorrectly. r=timdream, a=leo+
Bug 879177 - Can't fully scroll when searching (first time) contacts
Merge pull request #10414 from alivedise/bugzilla/879177_v1-train

Bug 879177 - Can't fully scroll when searching (first time) contacts
Bug 871919 - Retain screenshot layer above browser layer under attention
screen.
Merge pull request #10415 from alivedise/bugzilla/871919_v1-train_final_screen_shot_layer

Bug 871919 - Retain screenshot layer above browser layer under attention, r=timdream, a=leo+
Bug 879696 - Set channel of tone player to normal when not on a call
Merge pull request #10417 from alivedise/bugzilla/879696_v1-train

Bug 879696 - Set channel of tone player to normal when not on a call, r=etienne, a=tef+
Merge pull request #10381 from alivedise/bugzilla/876340/ftu-meets-sound-manager

Bug 876340 - Fix active channel during and after ftu running on v1-train, r=timdream, a=leo+
Bug 828965 - Move permission screen z-index on lockscreen camera
Merge pull request #9587 from evanxd/bug-869367

Bug 869367 - [Settings] The screen of Date & Time panel has redundant space when NITZ is NOT available.(cherry picked from commit e2dc1445fe3fb372f6ddc1caeb03489d59ff839b)
Merge pull request #10308 from lightsofapollo/normalize-email-alarms-when-time-changes

Bug 876794 - Update absolute alarm times when changing start times(cherry picked from commit 1ec8a103933b084b31be5fbb1d457fafc41d681b)

Conflicts:

	apps/calendar/js/ext/ical.js
Merge pull request #8585 from lightsofapollo/fix-cache-misses

Bug 849957 - Attempt to fetch busytime when cache is missed r=kgrandon(cherry picked from commit 75b2248b5847d97a5ea48add8f14723a410efcc8)
Merge pull request #10223 from lightsofapollo/clean-removal-of-events

Bug 867797 - Clean removal of events(cherry picked from commit cdeb777ff57c85fa236da621c179a1fd751cff20)
Bug 883732 - Fix SMS tests r=gnarf

* Wrap the code inside the `done` callback
* use an height of 100px instead of 50px to trigger multiline mode
* use this.sinon instead of sinon to ensure correct restore
(cherry picked from commit 0a86cde72998b8b039e47679a9862c54ac82c654)
Merge pull request #10271 from mozsquib/gallery-preview

Bug 873301 - Gallery should store image previews and video posters on same volume as image/video r=davidflanagan(cherry picked from commit fc0ed1fb2a72327378946c2d6601c63eae31b718)
Merge pull request #10347 from arcturus/bug-880645

Bug 880645 - [CONTACTS] Order by last name option doesn't work well when item count>500(cherry picked from commit 73095ca35ab66e817902316aafca12957726eb63)
Merge pull request #10375 from davidflanagan/bug880843

Bug 880843: correctly predict low-frequency words r=es92(cherry picked from commit 55fc01aa7a235c1963a6bb1d516ef051e197c278)
Merge pull request #10152 from leob2g/Bug_878662_Sound_Manager_CEWarningDialog_is_displayed_at_CEWarningVol_+_1

Bug 878662 - [System][Sound Manager] CEWarningDialog is displayed in incorrect timing, r=alive(cherry picked from commit c0f91ba5ffc7fd9e696b3b577fbd8971aaaf1180)