trebuchet and whisper commit

Change-Id: Id80e9ba83272914b4cd2a0bb8d786ed81653e5bf
Revert "Settings: Add preference for EdgeGesture service."

This reverts commit 36d5257caa6a1218755793b9dde0c67a208a7607.