Revert fix up expanded desktop behavior

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