Merge "Add an new internal DrawableContainer to handle animation scale == 0 case." into nyc-mr1-dev