Add back expanded desktop options.

Change-Id: I3ae23b2c247959728792c255b74104e126b92362
Merge "Add back expanded desktop options." into kk