[Code Cleanup] from #11168#12161

Venuska1117 wants to merge 2 commits intocmss13-devs:mastercmss13-devs/cmss13:masterfrom

Venuska1117:cleanup-designerVenuska1117/cmss13:cleanup-designerCopy head branch name to clipboard