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

Change-Id: I651a69a3fa6dc01646c94842b869e408133e1377