Merge "Bouncer: Improve push animations." into tm-dev