Merge "Fix BitmapShader to work with adaptive icons"