Don't rely on expanded desktop state for pie controls

Change-Id: If42efbe0e17ee044215077854ffc5b6284f6fc55
Merge branch 'sgt7' into CM10.1