Bug 1064491: Request per-app data usage after first requesting total data usage. r=salva
Bug 1081658 - Fix l10n remove locale regex
Bug 1071451: [AUM] Handle attention windows properly so phone calls are counted. r=djf
Bug 1075455 - Sync present date on month view
Bug 1081528 - Only handle attentionscreenopened events while task manager is showing. r=etienne
Merge pull request #25061 from shamenchens/Bug1081658-L10nRemoveLocale

Bug 1081658 - Fix l10n remove locale regex, r=RickyChien
Merge pull request #25082 from evanxd/bug-1075455-v2.1

Bug 1075455 - Sync present date on month view. r=evanxd
Merge pull request #23756 from mancas/bug1031374

Bug 1031374 - Overlay for Marketplace does not cancel when tapping home. r=etinenne
(cherry picked from commit 64fb49f3cd0b78ea0491acbc75b71c5ec988bd16)
Merge pull request #24935 from RudyLu/winMgr/bug1077609

Bug 1077609 - [Keyboard] When app permissions page asks user to add
r=timdream.
(cherry picked from commit ff81566d0f19741e67c0c3b1152a72022270110a)
Bug 1081748 - [Contacts] Deleting a comment on a contact collapses the whole comment thread on edit screen
Merge pull request #25100 from sfoster/not-shown-tm-bug-1081528

v2.1 Bug 1081528 - Only handle attentionscreenopened events while TM is showing. r=alive a=fabrice
Bug 1082779 - Use correct b2g-dekstop for make b2g, a=test-only
Bug 960800 - [B2G][SMS][RTSP] RTSP link doesn't appear as hyperlink when SMS is received

- add hyperlink support to rtsp protocol
Bug 1075151 - [Cost Control] Fte redraw is very choppy when tapping next or back
Bug 1073870 - Autocorrect word does not get cleared when moving the cursor around
Merge pull request #24960 from marshall/bug1064491_smartDataUsageTotal_v2.1

Bug 1064491: Request per-app data usage after first requesting total data usage
Merge pull request #25132 from RudyLu/ime/Bug1077609_uplift_v2.1

Bug 1077609 - uplift to v2.1.
Merge pull request #25150 from mikehenrty/bug-1082779-correct-b2g

Bug 1082779 - Use correct b2g-dekstop for make b2g, a=test-only
Bug 1068442 - Add marionette test for SHB on secure window r=alive

Conflicts:
	apps/system/test/marionette/lib/system.js
Bug 1074061 - [Costcontrol]Text and checkbox is shown so transparent