Merge "Add new hook WatchlistEditorBeforeFormRender"