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

* commit '4042c3a31492d772dfc6fd2f39fdfef2eea87d91':
  Fixing some touch / interaction problems