Merge branch tizen_2.2 into tizen