Merge pull request #22464 from cctuan/1046542

Bug 1046542 - User will get stuck running FTU if he access the utility tray to open settings app
Merge pull request #22343 from begeeben/1032024_refine_comments

Bug 1043890 - [browser][JSDOC] Refine comments and fix linting errors
Bug 1037606 - The placeholder text shown when the list of contacts is empty is left aligned in RTL mode
Merge pull request #22388 from pacorampas/1047224

Bug 1047224 - [Dialer] [Keypad] Follow up for 1043318
Bug 1046836 - Add the Swiss-french layout.
Bug 1048186 - [Contacts] Fix import timestamps tests to make them asynchronous
Bug 1033950 - [Settings] update selectors in AMDed wifi panel from #id t...
Bug 1032651 - [Gaia] CMAS on/off toggle in Settings

- Two toggles, CB and CMAS
- when CB off, CMAS is also off and disabled
- When CB on, user can turn on/off the CMAS
- When CB on, CMAS state will be retained to the state before CB off.
- add marionette test
- make CMAS totally count on CBS
Merge pull request #22442 from sudheesh001/Patch_1032044

Fixes bug 1032044, Errors on build/webapp-manifests.js r=yurenju
Merge pull request #22506 from RudyLu/keyboard/Bug1048682-jspinyin_unit_tests

Bug 1048682 - Fix failing jspinyin unit tests.
r=yxl.
Merge pull request #22475 from EragonJ/bug-1034560-another-try

Bug 1034560 - Utility tray is closed when the airplanemode button is pre...
Bug 1048798 - [Email] Gallery open activity is expecting attachment image filename in the data
Merge pull request #22505 from dominickuo/bug-1048673

Bug 1048673 - [Ringtones] stop the previews before leaving the app, r=jimporter
Merge pull request #22509 from RudyLu/iGormilhit-master

Bug 1046836 - Add the Swiss-french layout.
r=rudylu.
Merge pull request #22264 from gasolin/issue-1032651

Bug 1032651 - [Gaia] CMAS on/off toggle in Settings, r=arthur
Merge pull request #22489 from azasypkin/bug-1048204-back-button

Bug 1048204 - The back button seems like pressed even without pressed. r=schung
Merge pull request #22484 from ADLR-es/fix-bug-1048186

Bug 1048186 - [Contacts] Fix import timestamps tests to make them asynchronous
Bug 1048772 - Incorrect value in "app.update.battery-threshold.plugged" and "app.update.battery-threshold.unplugged" are allowed
Merge pull request #22476 from RudyLu/keyboard/Bug1048143_disableFTU_keyboard_test

Bug 1048143 - Should disable FTU and lockscreen when doing keyboard integration test.
r=gduan.
Bug 1047263 - Marionnette web-api tests on emulator-jb fail with "TypeError: apns is undefined", r=arthurcc