Merge "Initial pass at adding Music control to new keyguard." into jb-mr1-dev