Merge "CategoryViewer: Do opportunistic category recounts for mismatched file counts...