Merge pull request #12784 from snowmantw/issue925635

Bug 925635 - [LockScreen] Fix the track to match the icons(cherry picked from commit 41334990d9b7cfbb9415916c23f6930f2ddf63dc)
Revert "Merge pull request #12947 from davidflanagan/bug884752-v1.2"

This reverts commit 8cbe9e4fe267f010bfa1e6a96837b600492d020c, reversing
changes made to 22b95ba3a4df0c2e69ac19a7300cb9d43085a860.
Merge pull request #12906 from snowmantw/v1.2

Merge pull request #12784 from snowmantw/issue925635
Merge pull request #12955 from EverythingMe/908057-hd-icons-1.1

[Bug 908057] Fix e.me icons for 1.1 HD [r=ranbena]
Conflicts:
	apps/homescreen/everything.me/modules/Apps/Apps.js
Bug 927642 - Readd integration tests for notification lang/direction in gaia