Revert "Battery charge animation revamped"
Merge remote-tracking branch 'xy/jellybean' into franco