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

This reverts commit 4c063442af78c317ce30a5247b38fdcedc884a9e.