(BugId:97400) - Re-implement diff/preview support for CategorySelect that was lost somehow (see 82d95f85ba9f5ecfb03caef23487ec1a370f4d20).
Merge branch 'bugid-97400' into dev