Merge branch 'tizen_2.1' into devgfx