Merge "Revert "Touch exploration feature, event bubling, refactor""