Cherry pick recent changes in main to 1.1#130

chunqilu merged 3 commits into1.1aws/code-editor:1.1from

cherry-pick-main-to-1.1aws/code-editor:cherry-pick-main-to-1.1Copy head branch name to clipboard