Merge "Don't change state when inflating LayerDrawable"