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

Change-Id: Ibd2b6744b42fdf503fc31cbe616fc2b2f15e5f88