Merge "Icon class should support Maskable bitmap type"