more "proper" way of disabling ToC sliding.

(previous method was producing occasional crashes)

Change-Id: I8e05e92c3dd11ace9a3dccb2a7a2c57187efc87d
Merge "more "proper" way of disabling ToC sliding."