Merge pull request #23303 from yurenju/remove-files-log

Bug 1022192 - Add more log for utils-xpc:removeFiles() r=me
Merge pull request #23422 from sergi/new_markup

Bug 1043177 - Redesign Contact edit page [r=francisco]
Bug 1061118 - Dismiss keyboard on attention window requestopen or recovering
Bug 1038162 - [Music] check the A2DP connection before pausing the player when headphones are removed
Bug 1053477 - [B2G][OTA][Facebook] Facebook sync settings not preserved performing OTA from 2.0 to 2.1 in Contacts app
Bug 1061183 - Update back button locator in messages app
Bug 1061199 - Unxfail test_sms_with_attachments as Bug 1057973 is fixed
Merge pull request #23577 from viorelaioia/bug_1061199

Bug 1061199 - Unxfail test_sms_with_attachments as Bug 1057973 is fixed
Merge pull request #23576 from viorelaioia/bug_1061183

Bug 1061183 - Update back button locator in messages app
Bug 1061135 - disable intermittent failing tests
Merge pull request #23571 from evanxd/bug-1061135-disable-tests

Bug 1061135 - disable intermittent failing tests. r=me
Bug 1061221 - Intermittent failing test, TEST-UNEXPECTED-FAIL | /builds/slave/test/gaia/apps/system/test/marionette/notification_events_test.js | Notification events close event removes resent notification
Merge pull request #23529 from DouglasSherk/1060801-dialer-rename-cancelled

Bug 1060801 - Rename "Cancelled" to "Canceled" in call info view. r=Rik
Merge pull request #23580 from evanxd/bug-1061221

 Bug 1061221 - Intermittent failing test, TEST-UNEXPECTED-FAIL | /builds/slave/test/gaia/apps/system/test/marionette/notification_events_test.js | Notification events close event removes resent notification
Merge pull request #23269 from ADLR-es/fix-bug-1053477

Bug 1053477 - [B2G][OTA][Facebook] Facebook sync settings not preserved ...
Bug 1032675 - [System] upgrade the new default tones for OTA
Merge pull request #23138 from dominickuo/bug-1032675

Bug 1032675 - [System] upgrade the new default tones for OTA, r=timdream
Merge pull request #23417 from dominickuo/bug-1038162-new

Bug 1038162 - [Music] check the A2DP connection before pausing the player when headphones are removed, r=jimporter
Bug 1060965 - [Smart Collections] Cancel button is not localized r=kgrandon
Merge pull request #23541 from KevinGrandon/bug_1060965_collection_locale_inclusion

Bug 1060965 - [Smart Collections] Cancel button is not localized