Merge "Always apply color filter passed to DrawableContainer.setColorFilter"