Merge "New window cling for immersive mode." into klp-dev