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

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