Merge "Change launcher icons to MaskableIconDrawable Test: manual test"