Merge remote-tracking branch 'uix-stt/tizen'