Merge "Add invalidation to Drawable when its properties change"