Merge "Fix charging animation clipping" into qt-dev
am: 6df373efdd

Change-Id: I7af939b05d55a2a3cb369cb51b6737a7f9d3917b