Merge "Music in keyguard improvements - fix overscroll issue with workaround...

Merge "Music in keyguard improvements - fix overscroll issue with workaround described in bug 7137941 - ignore noisy signals from music player that sometimes hide it" into jb-mr1-dev