Bug 1022984 / Bug 1027536 - After Restarting Phone, Lockscreen Time Always Shows as 5:32 or Is Stalled
Bug 1023044 - Show the signal bar for a locked sim only when making emergency calls using the sim.
Merge pull request #20872 from crh0716/1023044_v1.4

Bug 1023044 - Show the signal bar for a locked sim only when making emergency calls using the sim. r=alive
Merge pull request #18736 from alivedise/bugzilla/1002316_v1.3t_real/sound-manager-home-event

Bug 1002316 - Homescreen event should be caught by sound manager, r=timdream
Merge pull request #20124 from timdream/keyboard-dbltap-back-v1.3t

Bug 1020628 - (1.3t) Don't allow user to start activity twice in keyboard settings +shepherd
Conflicts:
	apps/keyboard/js/settings/settings.js
Merge pull request #20951 from mnjul/bug_1027536_lockscreen_clock_stall_v1.4

Bug 1022984 / Bug 1027536 - After Restarting Phone, Lockscreen Time Always Shows as 5:32 or Is Stalled
Bug 997601 - Save the caller id preferece across reboots r=jaoo, a=1.4+
Merge pull request #20750 from RudyLu/keyboard/Bug1015541

Bug 1015541 - choosing a word suggestion after moving the caret changes the wrong text
r=janjongboom
(cherry picked from commit 73b9c780c54ec1c6fcf47c2ce467672d3c5aaded)
a=1.4+

Conflicts:
	apps/keyboard/js/keyboard.js
Bug 994176 - Create branched versions of marionette-client and consumer packages. r=zcampbell
Bug 987946 - [unittest] test_cold_launch.py failing

The test is failing because the correct app url is now not available until
shortly after launching.
This patch changes the test so it waits for the correct app url, rather than
just immediately asserting that it is as expected.