Merge "Workaround for broken BitmapShader in AdaptiveIconDrawable"