Merge "Don't treat user switch as slider interaction." into pi-dev