Merge branch 'tizen_2.4' into tizen_2.3