Merge "Fix animation bugs caused by weak reference" into honeycomb