Merge "Always return string on HTMLTagFilter::getInputHTML"