am 87023e79: am 4042c3a3: Merge "Fixing some touch / interaction problems" into jb-ub-now-indigo-rose

* commit '87023e79a0371523fb7ccc69931bc1f71edb9daf':
  Fixing some touch / interaction problems