Merge "Charger: Avoid animation while not charging DO NOT MERGE"