Animation lag temporary fix

Change-Id: I06e53ad1eebf6e341f8351e1779df13f9f5c8985