Merge "Implement correct music widget positioning in keyguard" into jb-mr1-lockscreen-dev