Merge "Update usages of icon shapes in Launcher" into main