Add option to enable / disable pie with expanded desktop

Change-Id: Ie4c7653c493364d1c0e82337693e2a305b018e22
Fix ' in string

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