Merge branch 'tizen_2.2'