Merge "Fix broken halt while in healthd charger mode"