Merge "Only animate when the slice is actually animating" into pi-dev