Merge "Completely remove use of Adaptor class" into tizen