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

* commit 'b5e1753d5dceed10dfc077c6a71e4ab3c9ecc8cc':