Merge "Removing explore by touch from settings." into jb-dev