Merge "sync code for tizen_2.2" into devel_3.0_main