Bugs 827969 & 827551 - gesture detector fixes r=lightsofapollo,cpeterson
Merge pull request #7400 from davidflanagan/bug827551

Bugs 827969 & 827551 - gesture detector fixes
Auto-merge from branch 'master'