Bug 1069817 - [sms] localization missing for unknown contacts
Bug 1018833 - Calendar sync duplicates events
Bug 1036210 - Recover the automatic connection once the manual connecon is failed r=eragonj
Bug 1069840 - Update apps links to fetch shared style from default theme v2.1.
Merge pull request #24801 from steveck-chung/bug-1069817-v2.1

Bug 1069817 - [sms] localization missing for unknown contacts
Bug 1056968 - [System] vibrates to notify the user vibration is enabled when volume is 0
Bug 1078921 - Only retrieve outgoing calls for Bluetooth redial
Bug 1073561 - [Edit Page] The + sign to add a photo to a contact is not centered anymore if you change the language. r=francisco
Bug 1079525 - [System][SHB] Do not offset dialog when software buttons enabled on lockscreen

Conflicts:
	apps/system/test/marionette/lib/system.js
Bug 1078229 - Update test_settings_dsds_cell_data.py to reflect changes from Bug 1077259
Merge pull request #24985 from oklang/update-apps-theme-links-2.1

Bug 1069840 - Update apps links to fetch shared style from default theme...
Merge pull request #24769 from millermedeiros/1018833-duplicate-events-2.1

Bug 1018833 - Calendar sync duplicates events r=gaye
Bug 1079699 - [System] Do not grow the home screen iframe src forever r=sfoster
Bug 1063658: workaround memory-backed blob bug 1079546 by ensuring that pick and share activities always use files
Merge pull request #24967 from crh0716/1036210_v2.1

Bug 1036210 - Recover the automatic connection once the manual connection is failed
Bug 1074601 - Take SIM card 2 into consideration when checking voicemail number
Bug 1016824 - Czech layout should be Qwertz.
Bug 1065520 - [Calendar][Week View] Events still display in Week view after they are deleted from another View
Bug 1079440 - Fix call indicators overlapping with multiple calls. r=gtorodelvalle
Bug 1079700 - Correcting errors in performance testing r=hfiguiere