Merge "Hide category changes if feature is disabled"