Inline cancelAnimation_ into stop

No one wants to cancel the animation without also stopping the drawer in place.
Also, fix a |self|/|this| typo.