Revert "Revert "Bring in CMs 3 real Circle battery && also circle dotted battery [1/2]""

This reverts commit 84a625a8272fcf6eaa62c4a6a5a231ad0bf076b8.