Merge pull request #18862 from wilsonpage/996766

Bug 996766 - [Camera][Mozilla] 1.4 Visual Design - Make Camera Settings
Merge pull request #18861 from wilsonpage/1001510

Bug 1001510 - [Camera] 1.4 Sub menu headers and active Options button
Merge pull request #18463 from nsarkar/bug998488

Bug 998488 - STK PLAY_TONE feature broken r=etienne
Bug 1002459 - Fixing an l10n issue with the hold button.
/!\ No change to the main en-US file.
Merge pull request #18885 from chirarobert/1004963

Bug 1004963 - Update camera tests
Long press results in the [x] showing up on all icons except the one you long-pressed, which comes in later
Bug 1002541 - Update marionette_client to 0.7.7
Bug 1003784 - Separate out FakeUpdateChecker.check_updates() and start_b2g(). r=zcampbell
[Bug975558][Camera][Madai]Visual Design Self-Timer
Bug 1003853 - Add comment for marionette.instance and restart
Merge pull request #18832 from zacc/bug_1003853

Bug 1003853 - Use remembered is_desktop_b2g property rather than marione...
Revert "Revert "Bug 999355 - Wait for 'render' class on appWindow to denote Gaia startup r=bebe""

This reverts commit 94af5ce3f4e0ed455a10ce15c71d103b8403e43e.
Bug 942756 - Unify debugger server startup: dbg-server.jsm should be imported in tests. r=janx
Bug 1000874 - Clean up bootstrap mozL10n API use in FindMyDevice. r=dougt
Merge pull request #18644 from stasm/1000874-findmydevice-once

Bug 1000874 - Clean up bootstrap mozL10n API use in FindMyDevice. r=dougt
Merge pull request #18880 from paulrouget/bug942756

Bug 942756 - Unify debugger server startup: dbg-server.jsm should be imported in tests. r=me
Bug 1000866 - Clean up bootstrap mozL10n API use in SMS. r=julienw
Merge pull request #18643 from stasm/1000866-sms-ready-once

Bug 1000866 - Clean up bootstrap mozL10n API use in SMS. r=julienw
Merge pull request #18863 from benfrancis/999141

Bug 999141 - Fix statusbar visibility on lockscreen r=etienne
Bug 996692 - Fixing the fullscreen statusbar regression and update the test to catch it next time.
r=kgrandon