Last Temp fix for Expanded desktop

Change-Id: I7829ae8e5ca473da504c0e02bf6d4474d51d13a6