Merge "Move clearColorFilter() workaround to DrawableCompat"