am 492c67a8: am bd573049: Merge "Putting the gesture debugging back in the box." into jb-mr2-dev

* commit '492c67a8b12ce154e41dc48102ae99e0c0e5210d':
  Putting the gesture debugging back in the box.