Make animation catchup plain and simple

Change-Id: Iee2ff60e9f3c6509cb16ab7410fbe994ee0c5256
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>