Merge branch 'tizen_2.3' into tizen_2.4