merge for sync with tizen_3.0 branch