Merge "Add ContentHandler::supportsCategories method"