Merge "Revert "Fixing Drawable methods for find by layer ID and invalidation callback""