Merge tizen_5.0 codes into tizen_4.0