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