* upstream/develop: Fix one click nsfw unhide on videos Escape HTML from display name and subject fields