Keep current battery icon and update halo on theme changes

Change-Id: I9e1d2ddfde2bed0726c35601345f081d2a35016e