Merge branch 'tizen' into sandbox/srk/hwc