Merge "Edit stash: Support CodeEditor"