Merge "Fix circle battery opaqueness for...

…the low battery color"