Merge "Fixing LayerDrawable methods for find layer and invalidate"