Faster animation settings thanks to vanir

Change-Id: Ie2ac6a232eab93c6d9f4de01e72043c55eab1b03