Merge pull request #15607 from KevinGrandon/bug_961351_to_master

Bug 961351 - Clear button not visible when focusing on rocketbar
Merge pull request #15289 from davidflanagan/bug956172

Bug 956172: add a dismiss button to word suggestions in refactored keyboard r=janjongboom
Merge pull request #15638 from crh0716/961746

Bug 961746 - Passing the correct parameter to showIfLocked r=alive
Bug 959053 - [settings] add marionette test for battery panel
Bug 943750 - Music app will not show files in pick mode if device is shared using USB and then unplugged
Merge pull request #15514 from vsireesha246/Bug_959996_TypeError_thumbnailList_is_undefined

[Video]Bug_959996_Check_For_thumbnailList_error  r=johnhu
Merge pull request #15401 from crh0716/930108

Bug 930108 - Adjust padding r=evelyn
Bug 963403 - [clock] build: make_gaia_shared.js should use source dir for shared dependency scanning
Merge pull request #15663 from gasolin/issue-959053-lintfix

Bug 959053 - [settings] add marionette test for battery panel with jshint fix, r=arthur
Bug 963406 - [AppWindow][JSHint] Fix jshint errors in AppWindow
Merge pull request #15592 from steveck-chung/DSDS-sim_switch_for_MMS

Bug 961942 - [DSDS][MMS] Switch data connection confirmation message contains strings failed to be localized. r=@crh0716
Merge pull request #15665 from jrburke/bug963403-clock-shared-gaia-src

Bug 963403 - [clock] build: make_gaia_shared.js should use source dir for shared dependency scanning r=mcav
Merge pull request #15590 from asutherland/testing-reporter-consistency

Bug 945095 - Use same format to set reporter between test-agent & test-integration. r=julienw
Bug 963333 - [Search] Tapping on places does not load browser r=daleharvey
Bug 948958 - [Messages][MMS] MMS does not display correctly when it has a subject but no content
Merge pull request #15666 from snowmantw/issue963406-jshint-appwindow

Bug 963406 - [AppWindow][JSHint] Fix jshint errors in AppWindow
Merge pull request #15646 from acperez/bug-951681

Bug 951681 - Single variant build process uses invalid init.json
Bug 960103 - Javascript Warning. Error in parsing value for background. Declaration dropped. {file: firsttime.css
Bug 963108 - Remove reference to icc_helper library
Bug 961742 -[Cost Control] Check balance with Brazil VIVO prepaid SIM card is not detected if it only has a decimal digit