Merge tizen_4.0 into tizen