Merge "Reset constant width/height when DrawableContainer density changes"