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

* commit 'a7f6936edc4baef281add618ed98de49ccc2fac0':