pie toggle state, not desktop mode

Change-Id: I4320faacd2ee96ee84e99c26417e433ce35439a7
Merge remote-tracking branch 'upstream/jellybean' into jellybean