Merge "InlineEdit: Allow to navigate to diff screens from edit screen"