Removes usage of Custom Variants form Widgets Enhancements, Swipe and
ClientCanvas. See DataWhitelist for new key/values.

Change-Id: I62fe0ef7c777ed4b93cfc8e370f50847c2d2d43d