Settings: Fix apostrophes

Change-Id: Icea8b908d786fa1586ab5dde35aae7dc67746568
Settings: Add preference for EdgeGesture service.

Update: Default to true

Change-Id: I0325b0a9aa6eb943b48483aebe151726a2c64ac4
Settings: Merge CM