Merge "Add option to hide music controls in lockscreen." into cm-10.1

Change-Id: I802a50d99c349e53738a5d4a6b3bcc5f798d0927