Fix TB3 local testing and occasionally failing SliderDisableTest.

Change-Id: I58e60e55838c3339c934cf975e5e148c8f09a78b