Sync changes from 1.1 into main branch#151

feiyangliu2023 wants to merge 2 commits intoaws:mainaws/code-editor:mainfrom

feiyangliu2023:sync-from-1.1feiyangliu2023/code-editorv2:sync-from-1.1Copy head branch name to clipboard