Merge "Invalidate DrawableContainer's cached canConstantState on child add" into nyc-dev