Expanded status bar header margin adjustments

Change-Id: I73ecbe15448ba4d6f120ed8256962bd1463a264f
Keep current battery icon and update halo on theme changes

Change-Id: I9e1d2ddfde2bed0726c35601345f081d2a35016e