Merge "EditWatchlistNormalHTMLForm: Fix double-escaping of section legends"