Merge "Fix latent bug with reinitializing an ObjectAnimator." into honeycomb