Merge "Do not double decode HTML entities for IDs"