Merge "Remove Adaptor class from Public API" into tizen