Merge branch 'tizen_2.4_merge' into tizen