Merge "Get rid of upperbound on wireless charging anim" into pi-dev