Merge "Implement music and user priority scheme in keyguard" into jb-mr1-dev