Merge "Support for changing density of DrawableWrapper subclasses"