Merge "Fix slow page animations on large devices" into tm-dev