Refactor expanded desktop to immersive mode

Change-Id: I32b44da4d6597d742dc90d38b28ca610a6f79a08