Revert "mako: Enable s2w in Settings"

This reverts commit c35166d30e7264991567c32a961d7dbb6bb04f5c.

Change-Id: I274e15e1c1645a080758bc6e3ba5cd9eb0ae7bad
Merge "Revert "mako: Enable s2w in Settings"" into kk_mkt