Merge "Fix minor issues on adapter name property" into tizen