Make immersive mode mode option names make more sense

ordering and associated values are NOT CHANGED

Change-Id: I31fa06464a8311dc674ee5ad04b7e8624575c08f