Merge pull request #685 from ablake/next

Gamepad fixes / polish.
Reverting an accidental change to the FormsTest.
Merge branch 'next' of https://github.com/blackberry/GamePlay into next