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

* commit '23bada291d8367a55d5ee9e866f49e7759de065e':