circle battery bugfixes, margins, per-app-color

Change-Id: I8888a8bc401f6086836ff8d6827c6aa1ac20f9b4