Keep current battery icon and update halo on theme changes

Change-Id: Iefa84b67b5d84c2d98cce90a75bb2422cc516e52