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

* commit 'ff9191f02dd47e64d5d92889f1de69b2f0c223b3':