Bug 1089459 - [Settings] Performance regression on bug 1066830
Bug 1092112 - [Messages] Waiting screen never disappears if user confirms thread deletion when there is not any selected thread. r=schung
Bug 1082935 - Fixing scope problem with bluetooth transfer device name
Bug 1088575 - [LockScreen][EmergencyCall]After click 'More info' in app permission, enter emergency call will get all functionalities broken
Bug 1087475 - [Flame][Camera]The viewfinder will fail to function when the user opens and closes the camera app multiple times via the home button
Bug 1090149 - Ignore opening timeout is app is killed
Bug 1079543 - Preview is getting freeze after opening & closing Camera app during WEBRTC video call
Merge pull request #25636 from justindarc/bug1079543-v2.1

Bug 1079543 - Preview is getting freeze after opening & closing Camera a...
Bug 1093393 - v2.1 [email] : Your Name not saved if email setup goes to password card
Merge pull request #25753 from timdream/keyboard-aria-label2

Bug 1092911 - Correct aria-label for layout switching keys, r=rudyl
Conflicts:
	apps/keyboard/js/keyboard/layout_manager.js
	apps/keyboard/test/unit/keyboard/layout_manager_test.js
Merge pull request #25687 from EragonJ/v2.1-bug-1089459

Bug 1089459 - [Settings] Performance regression on bug 1066830
Bug-1050129 [Gallery] Single file delete delay fix
Bug 1078901 - Confirmation dialog when deleting apps blocks notfications and software home button. r=kgrandon
Bug1088051 - Fix of stuck in image edit window on clicking edit icon immediately after image delete r=djf

Conflicts:
	apps/gallery/js/ImageEditor.js
Bug 1092389 - Add 'ehrpd' to list of CDMA network modes. r=gsvelto
Bug 1093602 - Remove LogShake feature from v2.1 r=janx

The Gecko code for LogShake feature only landed in master. So we should
rather remove the Gaia exposition of this to avoid confusion for users
and developpers.
Merge pull request #25806 from lissyx/bug1093602

Bug 1093602 - Remove LogShake feature from v2.1 r=janx
Merge pull request #25790 from jrburke/bug1093393-v2.1-email-display-name-setup

Bug 1093393 - v2.1 [email] : Your Name not saved if email setup goes to password card r=asuth a=fabrice
Bug 1071542 - [Search] Blurry Settings Icon & incorrect alignment and sizing of string
Bug 1092161 - Properly handle MMI short-string codes r=drs