Merge "Fixing some touch / interaction problems" into jb-ub-now-indigo-rose