Refactor expanded desktop to immersive mode

Change-Id: Id1738031730be7324670497fbff6cec34081d101