Merge pull request #16353 from snowmantw/issue973501

Bug 973501 - [LockScreen] Fix undefined "lockScreen" and "LockScreen"
Bug 968751 - Write a test to open long-press power button menu
Merge pull request #16223 from mcjimenez/bug923455

Bug 923455 - SV: Predictive text configurable by SIM
Merge pull request #15974 from gitmai/bug-968110-CC-javascript-error-when-notification-open-CC

Bug 968110 -[costcontrol] Javascript error when open a notification when...
r=salva
Merge pull request #16171 from bebef1987/ftu_wifi

Bug 970828 - test_ftu_skip_tour often failing to connect to WiFi
Merge pull request #16175 from bebef1987/sleep_menu

Bug 968751 - Write a test to open long-press power button menu
Bug 972701 - [Camera] Stop Icon overlaps with Camera Shutter icon while recording video

Conflicts:
	apps/camera/style/controls.css
Fixed intermittent failures of test_call_log_all_calls()
Removed two steps from the test because they are not present in the moztrap scenario and the test fails intermittently when changing from call log to keypad.
Merge pull request #16050 from mikehenrty/bug-968914-unittests

Bug 968914 - Follow-up: Add unit tests for SIM Dialog Retry count
Merge pull request #16364 from chirarobert/remove_call_log_to_keyboard

Fixed intermittent failures of test_call_log_all_calls()
Bug 968150 - test_sms_to_dialer.py - Shuffle test order to avoid race r=bebe
Merge pull request #16363 from zacc/bug_968150

Bug 968150 - test_sms_to_dialer.py - Shuffle test order to avoid race r=...
Merge pull request #15804 from crdlc/bug-964724

Bug 964724 - Hide regular Offline Error Screen When Connectivity Resumes...
Bug 962649 - Be nicer to the event loop during edge gestures.
Bug 973598 - Fix test_sms_notification intermittent failure
Added a wait for the homescreen to fully load  before sending the sms.
Fix Arrow Position

Reposition the background image to fit
Merge pull request #16368 from nucliweb/97360-Cost-control

Fix Arrow Position
Bug 973665 - Bump version to 0.18.0 in Gaia
Merge pull request #15753 from steveck-chung/bug-961950

Bug 961950 - Replace message edit button with option menu contains delete / settings option
Merge pull request #16375 from julienw/bump-test-agent-0.18.0

Bug 973665 - Bump version to 0.18.0 in Gaia r=me