Fix bug keyboard not working since add Media keyboard support
Merge branch 'master' into bluetooth