Fix up expanded desktop option

Change-Id: I1fee0bde3fb60fa52724f3b93048f4a5c0f72e5c