[ryandrake]

Turning off Watch History only disables shorts on the main page, not in search results or the side-bar. It's a good start but incomplete solution.