[v2.1] Bug 964037 - (gaia-rtl) Support RTL for Lockscreen App
Bug 1073534 - Include Contacts properties files in Callscreen to get their "cancel" keys. r=Rik
Merge pull request #24482 from DouglasSherk/1073534-callscreen-cancel-v2.1

Bug 1073534 - Include Contacts properties files in Callscreen to get their "cancel" keys. r=Rik
Bug 1063685 - Add getAppByURL to the AppWindowManager. r=alive

Conflicts:
	apps/system/js/places.js
Bug 1067356 - Changing notifications font-size
Bug 1069243 - Dont prefetch favicons for history. r=kgrandon
Merge pull request #24302 from KevinGrandon/bug_1071112_rocketbar_postmessage_error_logged

Bug 1071112 - [Rocketbar] Migrate to using promises for search connection init
Bug 1071388 - Hide the SHB during the boot logo sequence r=etienne
Bug 1050558 - Bosnian Word suggestion.
Bug 1071953 - [Rocketbar] Tweak visibility controls for open-window.showApp and apploading.stayBackground r=alive
Bug 1062728 - [email/pop3] POP3 sync breaks on messages that lack a Date header. r=mcav

land https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/340
Bug 1064630 - [Lockscreen] Locking device after entering a passcode leaves the user in an unrecoverable state
Merge pull request #24261 from snowmantw/issue1064630-v2.1

Bug 1064630 - [Lockscreen] Locking device after entering a passcode leav...
Merge pull request #24319 from EragonJ/bug-1071387

Bug 1071387 - [Settings] STK icons are missing and SIM labels is above o...
Merge pull request #24420 from anefzaoui/bug-964037-v2.1

[v2.1] Bug 964037 - (gaia-rtl) Support RTL for Lockscreen App
Bug 1065519 - Ambient indicator based on list of notifications

Conflicts:
	apps/system/test/unit/notifications_test.js
Bug 1061096 - Fix the edit button is not disabled

Conflicts:
	apps/settings/test/unit/downloads_list_test.js
Bug 1068986: convert MediaFrame to use background-image instead of <img>

fix failing unit tests

fix the failing python unit tests with a CSS selector change

fix busted share button by restoring public imageblob property on MediaFrame
Bug 1072125 - [Settings] position of label and carrier name are wrong
Bug 1071634 - ICE Contacts Group Shortcut seems to be visually incorrect