Update CodeEditor to master

Change-Id: I7ffb031af5aee624783556e0e2f4edb25abae88f