Circle battery bugfixes, margins, per-app-color
circlebattery bugfixes

Change-Id: I97bb4f28523d26e4c3e549c04e82400a21d70a61