am d4d1b504: (-s ours) Merge "Charger: Avoid animation while not charging DO NOT MERGE"

* commit 'd4d1b5045cfb602a7c57cbf29b2543e26106a1fd':
  Charger: Avoid animation while not charging DO NOT MERGE