Bug 828965 - Move permission screen z-index on lockscreen camera
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)
Merge pull request #10386 from leob2g/Bug_834148_volume_up_key_skips_vibrate_when_moving_up_20130614

Bug 834148 - move from silent to vibrate instead of volume 1 when moving up, r=alive, a=leo+(cherry picked from commit a91a0e4970a11e373eff1b284adbeb320cc3a7a8)
Merge pull request #10413 from mozshiao9/master_email_860262

Bug 860262 - [Email] When selecting the option “replying to all” or “reply” or “forward” on an email that was previously sent without Subject, the new Subject is shown as: “Re:null” or “Fwd:null”, r=asutherland(cherry picked from commit 84e2ce0199b14b36ebd7eb0de8fa5d4b156c864e)
Merge pull request #10392 from alivedise/bugzilla/883016/gallery-landscape-quality

Bug 883016 - Set default orientation of wallpaper same as homescreen, r=timdream, a=leo+(cherry picked from commit 96b981ab0ccfde28ba02e654fe0cb3e139a47439)
Merge pull request #10330 from lodr/bug-881866-compare-user-dates

Bug 881866 - Once the backend is fixed and only time-zone-aware dates are returned, mindgap.js must compare local dates.
r=arcturus(cherry picked from commit 5eb19071334a4f71c23410363e0fdaee8a1fd5b3)
Merge pull request #10434 from lodr/bug-882656-topup

Bug 882656 - Restoring topup functionality
r=arcturus(cherry picked from commit c2a74edb8871e126bf0edd6f911262fba717ad9d)
Bug 857105 - Keep the item taped highlighted while the panel loads

- Replaces the hash/hashchange mechanism with a setter for currentPanel.
- Adds a 'panelready' event when the panel is displayed.
(cherry picked from commit eb6417144696335108a7fb1700ff2cfb57d6bf45)

Conflicts:
	apps/settings/js/settings.js
	apps/settings/style/lists.css
Merge pull request #10344 from Rik/stk-icc-lazy-loading-879773

Bug 879773 - STK panel can't be opened by async STK commands r=frsela(cherry picked from commit e3d191adfb54497524ddef31de2b6defc93bf4e7)
Bug 879773 - Fix linter tests shame=rik
(cherry picked from commit 81441427a3ee58410a70e79aec4a6fae40507c50)
Merge pull request #10429 from alivedise/bugzilla/828965_v1-train/permission-screen-on-lockscreen

Bug 828965 - Move permission screen z-index on lockscreen camera, r=timdream, a=leo+
Merge pull request #10328 from pivanov/bug-880240

Bug 880240 - Update Firefox Logo on device r=@samjoch(cherry picked from commit 6a17febce2551cd3a764bb3bce39fe9ca88c5ca4)

Conflicts:
	shared/resources/branding/official/Browser@2x.png
	shared/resources/branding/official/about_logo@2x.png
	shared/resources/branding/official/initlogo@2x.png
	shared/resources/branding/official/logosmall@2x.png
	shared/resources/branding/official/powered@2x.png
	shared/resources/branding/official/privacy_sprite@2x.png
Merge pull request #10076 from jaoo/876543

Bug 876543 - [Settings] Configure voicemail info through the Settings App. r=kaze,etienne a=leo+(cherry picked from commit 4addf3f4fe3852abc71da7766efe741601250d9f)