Merge "Remove ContentHandler::deprecated()"