Bug 917276 - Update lockscreen app and tests to address changes to the lockscreen markup
Address review comments.
Replaced calls to launch(), changed method name, made wait_for explicit.
Bug 917463 - [Clock] Implement scrolling inertia in inline time picker for Timers - r=jugglinmike

https://bugzilla.mozilla.org/show_bug.cgi?id=917463

- Removes "slow down" effect when under threshold, is awkward
- Adds "inertia" by detecting the speed of the last pan event when a swipe finishes and adjusts the index properly
- Separated out the "stopInteraction" method from the onswipe
Revert "Bug 911696 - [Dialer] [Flatfish] hide dialer app in homescreen if no telephony support"

This reverts commit 4cfe3660a8f293f54c111d07fca5cec6089bd32a.
Merge pull request #12272 from bobsilverberg/bug917276

Bug 917276 - Update lockscreen app and tests to address changes to the lockscreen markup
Merge pull request #12302 from KevinGrandon/bug_918122_fix_contacts

Revert "Bug 911696 - [Dialer] [Flatfish] hide dialer app in homescreen if no telephony support" r=fabrice
Bug 918174: Load contacts CSS from index.html
Bug 917208 - [Contacts] Phone field appears twice when merging two contacts with same phone number
Merge pull request #12290 from jmcanterafonseca/bug-917208

Bug 917208 - [Contacts] Phone field appears twice when merging two conta...
Merge pull request #12304 from wanderview/contacts-css-opt

Bug 918174: Load contacts CSS from index.html
Bug 821673 - Redesign back, menu and close buttons
Merge branch '821673' of https://github.com/rnowm/gaia into 821673