Merge branch 'tizen_2.4_dev' into tizen