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