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

Change-Id: I3add03364cc36b1b72b5cc7e0bbea912d0abc683