Merge "Fix config client type as a bit flat" into tizen_6.5