Merge pull request #12784 from snowmantw/issue925635

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

Merge pull request #12784 from snowmantw/issue925635