Fix Expanded Desktop

Change-Id: I8b52de12730038852183039eabeb45d1b12336e6