Merge "Only animate when the slice is actually animating" into pi-dev am: 3116918bf0
am: 5bf2a5de6f

Change-Id: I5247d66f300187728af4b0d6dbd837a021733794