Merge "Fix getSelectionModeForCategory"