Re-implement expanded desktop for 4.4

Change-Id: Ib903b80079f9e00fde03f82edb1ab438ab5ad174