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

Change-Id: I8f61686d8f752a83870fc66d5a8a304537c525e4