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

Change-Id: I932c3be8044682f2956c7c0ee7a35a37b6305ad4