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

Change-Id: I8d6fb13157464f05f3cf63246501735c27ba3a40