Merge pull request #22366 from wilsonpage/1015249

Bug 1015249 - [Purchased Media] Update to use gaia-header
Bug 1032071 - [Settings] Remove BT panel and embed it from BT app
Bug 1045701 - Part 2 [Homescreen] - Do not migrated un-initialized smart collections r=amirn
Bug 1040952 - Camera/Video should use Color layer for background
Merge pull request #22527 from julienw/fix-desktop-mock

 Bug 1048902 - [Messages] fix small issue in the desktop mock r=azasypkin
Merge pull request #22493 from KevinGrandon/bug_1045701_smart_collections_ota

Bug 1045701 - Part 2 [Homescreen] - Do not migrated un-initialized smart collections
Bug 1049137 - Disable intermittent failing test, TEST-UNEXPECTED-FAIL | /builds/slave/test/gaia/apps/system/test/marionette/app_usage_metrics_test.js | App Usage Metrics > Uninstalled apps are counted
Bug 1049143 - Disable intermittent failing test, TEST-UNEXPECTED-FAIL | /builds/slave/test/gaia/apps/search/test/marionette/places_search_test.js | Places tests Test url searching
Bug 1049154 - [Collection App] Home screen naming consistency r=amirn
Merge pull request #22529 from justindarc/bug1040952

Bug 1040952 - Camera/Video should use Color layer for background
bug 1047609 - Land 60x60 version of new System App icon. r=kgrandon
Merge pull request #22539 from nullaus/bug1047609

bug 1047609 - Land 60x60 version of new System App icon. r=kgrandon
Merge pull request #22514 from psingapati/Bug_1048798_Open_Attachment_FileName

Bug 1048798 - [Email] Gallery open activity is expecting attachment imag... r=jrburke
Stop messaging #gaia
Bug 1039966 - Bump marionette_client dep to 0.8.1
Merge pull request #22542 from jonallengriffin/bug_1039966

Bug 1039966 - Bump marionette_client dep to 0.8.1
Bug 982163 - [Dialer] Remove SimSettingsHelper.getCardIndexFrom shim in CallHandler.call(). r=Rik
Bug 1048784 - Button OK for dialog about invalid email address should be centered
Bug 1048539 - [B2G][Email][Drawer] The account selecter pull-down is displayed improperly in the Drawer
Merge pull request #21987 from ian-liu/settings/bug1032071_remove_bt_panel_and_embed_it_from_bt_app

Bug 1032071 - [Settings] Remove BT panel and embed it from BT app, r=arthur, ej