Merge remote-tracking branch 'origin/Integrate-Blit-Feedback-and-Add-Timout'
Merge branch 'master' of https://github.com/RyanMaciel/oos-mobile