Merge "Add null check for wireless charging animation." into pi-dev