Merge remote-tracking branch 'origin/API6' into tizen_5.5_tv