Merge "Tweaks to wireless charging animation" into pi-dev
am: 361b809e08

Change-Id: I3efc3212fb6ba2cbdd3b3927954c2dbed3fa5a29