Reimplement expanded desktop on top of immersive mode.

Change-Id: I8ed08afebef0bb08a2694b1dbdd6dd1887b5b065