Refactored slider disable test.

Change-Id: I800c66399f32ca671d41425b11bd059def1fa9c9
Merge changes from origin/7.1

7a47feb Refactored slider disable test.

Change-Id: I11e49db753753073dcaec634cd54ce0b17c71ad8
Merge "Merge changes from origin/7.1"