Merge "add Launcher flag for launcher icon shapes" into main