Merge "Skin: Hard deprecate escapeSearchLink()"