Merge remote-tracking branch 'watch-application/tizen'