Merge "Delete secondary text in charging animation" into pi-dev