Only use a single preference for expanded desktop, do not remove pie

Change-Id: I0831ba5b48b52f14902602cacc4ca0a577852a69
Merge remote-tracking branch 'sgt7/cm-10.1' into cm-10.1-sgt7