Merge "Fix dock battery tile display." into cm-10.1

Change-Id: I318d0c4bde412f7bbf13bccedec3356c74d70372