Merge "Tweaks to wireless charging animation" into pi-dev