Merge "Fix getSelectionModeForCategory" into sc-dev