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

Change-Id: I4d54327e98a43b653e3f55fbd107b8d8249e132d