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

Change-Id: Iedca35d43cabe6b729327d652bdfbd0ac49f6542