Fix jumping animation when using two-finger expand

Also fixes other minor issues with the panel expansion.

Bug: 17250134
Change-Id: I70ee5410bad10ff71f6d868005bf6274ef881e95
2 files changed