Merge "Avoid begin/commit in Category::getCountMessage()"