Revert "Merge pull request #12163 from jmcanterafonseca/bug_details_matching"

This reverts commit c0ff597baabf4433b767421d9a513b95f40c406a, reversing
changes made to 4e6c0c9ea2f8ef78634295f52e48f5f8e695c776.
Merge pull request #12195 from rnowm/settings-margins

Bug 913015 - [Settings] Buttons are not using 1.5rem margins
Bug 912494 : conference call detail window
bug 915920 - ensure APN settings only get applied once per boot.
Merge pull request #12124 from rexboy7/fix-bug906675-3-refactor-HandledCalls

Bug 912494: conference call detail window
Merge pull request #12013 from snowmantw/issue913377

Bug 913377 - Redesign of lockscreen implementation, r=timdream
Merge pull request #12183 from alivedise/bugzilla/883738/disable-notification-toast-in-ftu

Bug 883738 - Ignore tap event when ftu is running. r=timdream
Bug 902399 In the Contacts duplicates screen allow to show a summary of the matching info
Merge pull request #12190 from alivedise/bugzilla/912796/lockscreen-meets-attentionscreen

Bug 915468 - Back to main screen when attention screen is shown, r=timdream
Merge branch 'master' of github.com:mozilla-b2g/gaia
Update gaia-ui-tests.json; Merge pull request #1366 from zacc/rename_actions_activities

Rename the Actions class to Activities to represent the correct nomencla...
Bug 915149 - Add Missing Setting Graphics
Revert "Revert "Merge pull request #12159 from gaye/bump-marionette-deps""

This reverts commit 405f94407e3fb08f86ebb966877e66dd95c8de07.
Bump marionette client to 0.15.3
Merge pull request #12212 from gaye/bumpt-marionette-client

Bumpt marionette client
Merge pull request #12207 from jmcanterafonseca/matching_details_b

[REOPENED] Bug 902399 In the Contacts duplicates screen allow to show a summary of ...
Merge pull request #12192 from jld/idb-storage-persistent

Bug 916009: Adapt gaia reference workloads to indexedDB changes.
Merge pull request #12211 from jaoo/916044

Bug 916044 - [System] Allow the apn.json database generator to handle correctly MCC codes starting with 0. r=kaze
Bug 915920 - Fix operator variant MCC and rebuild apn.json
Merge pull request #12206 from qdot/915920

Bug 915920 - APN values should only be updated once per phone boot