Merge "Touch exploration feature, event bubling, refactor"