Immersive Mode: rework to bring inline with cm