Merge "Merge branch 'devel/tizen' into tizen" into tizen