Merge "[Stacked Icon]Fixed Prevent issues:20743,19168"