Merge pull request #14532 from julienw/fix-intermittent-call-log

Bug 938207 - [Dialer] Intermittent Travis Unit Test Failure: dialer/call...
Bug 937251 - [Cost Control] Remove proxy
Bug 947786 - remove 'var navigator = window.navigator'
Bug 948842 - Re-enable test_sms_with_attachments.py
Merge pull request #14550 from dominickuo/bug-945464

Bug 945464 - [music] add will-animate to music app, r=dominickuo
Merge pull request #14529 from jaoo/933203

Bug 933203 - [DSDS] Operator variant logic: APN settings. r=kaze
Merge pull request #14408 from EverythingMe/937536-collection-no-icon

Bug 937536 - [e.me] Custom Collection is generated without an icon [r=ranbena, evyatron]
Merge pull request #14171 from EverythingMe/944068-collection-style

[Bug 944068] Revise collection style [r=crdlc]
Merge pull request #14525 from karlt/942751

bug 942751 - stop OscillatorNodes when done to work around bug 897796 r=etienne
Merge pull request #14562 from askeing/948842

Bug 948842 - Re-enable test_sms_with_attachments.py
Merge pull request #14552 from askeing/948799

Bug 948799 - Xfail test_cost_control_reset_wifi.py
Bug 924843 - Icons on grid do not re-arrange automatically when dragging over collections
Fix indent
Bug 948862 - [Contacts] The first time exporting a contact to SIM creates a duplicate of the contact in the contact list
Bug 948385 - Merge test_set_alarm_repeat, test_set_alarm_snooze, test_set_alarm_sound.py
 Bug 888253 - Settings data migration for keyboard layouts
Revert "Merge pull request #14529 from jaoo/933203"

This reverts commit 4dd40d64f137c48104d5f39e48c2ccb0ce9ab78c, reversing
changes made to 0985280ffc917353eb34ff7b0dcc1c152856450c.

This is breaking unit tests:
[system] system/LockScreenConnInfoManager > Single sim devices "before each" hook:
TypeError: MockNavigatorMozIccManager.addIcc is not a function
Merge pull request #14476 from malini/mixin

Bug 925398 - Refactor runtests.py to follow Mixin pattern, r=davehunt
Bug 948852 - Fix the event creation error
bump marionette-client and gaiatest versions, enable gaia-ui-tests