Stop pie controls from disabling expanded desktop

Change-Id: Ie164b753459c26888ea723209790d11675bef9c7
Merge remote-tracking branch 'sgt7/cm-10.2' into cm-10.2-sgt7