Commits
Craig Mautner authored 3aa7fcac1c4
Revert change to correct animations. Incorrect animation was introduced with CL 196207 (perhaps in combination with a later CL). Reverting part of that CL fixes the incorrect animation and so far has not reintroduced the jank that was fixed by that CL. If the jank reappears it should be fixed in a different fashion than in CL 196207. Fixes bug 6597505. Change-Id: Ie8012237a8d49810ede51bd8d78ef8c2fd91ddd4