Merge "Revert "Refactor WirelessChargingAnimation.""