Merge "Inline edit: Fix adding new files to change edit"