Merge branch 'for_tizen_2.4' into tizen_2.4_dev