Merge "Bouncer: Add error animation for buttons" into tm-dev