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 1071542 - [Search] Blurry Settings Icon & incorrect alignment and sizing of string
Bug 1092161 - Properly handle MMI short-string codes r=drs
Bug 1066847 - Adding tests to icons in the tray

Conflicts:
	apps/system/test/marionette/statusbar_icon_color_test.js
Bug 1089451 - Swiping down from top edge when utility tray is already open and it closes; quite opposite from gesture's movement
Bug 1088352 - [Rocketbar] Resize frontWindow on system-resize r=alive
Bug 1067625 - Increasing timeout for performance tests to account for longer profile creation a=npotb r=lightsofapollo
Merge pull request #25705 from gmarty/Bug-1082935-Fixing-scope-problem-with-bluetooth-transfer-device-name-v2.1

Bug 1082935 - Fixing scope problem with bluetooth transfer device name
Bug 1081403 - [email] two searches that result in the same number of matches can lead to empty search list
Bug 1091310 - block-type tags inside a tags should be wrapped by the a tag r=asuth
Bug 1088456: unload the current video if the view activity is running and we are still in the foreground
Bug 1088024 - [Flame] The first activity window causes the foreground app can't be rotated to landscape
bug 1091775 - adding new png files for status bar
Merge pull request #25696 from azasypkin/v2.1-bug-1092112-deletion-waiting-screen

Bug 1092112 - [Messages] Waiting screen never disappears if user confirms thread deletion when there is not any selected thread. r=schung
Bug 1053641 - Remove newlines from localized strings describing call forwarding status r=drs

(cherry picked from commit c451052868e71c932311dae95d99857c5b368f49)

Conflicts:
	apps/communications/dialer/locales/dialer.en-US.properties
Merge pull request #25899 from gabrielesvelto/bug-1053641-v2.1-uplift

Bug 1053641 - Remove newlines from localized strings describing call forwarding status r=drs