Merge "Only block invalidation in DrawableContainer initialization" into nyc-dev