Merge "Ignore density in AdaptiveIconDrawable"