* commit '1de623939090993d03a7c398d09e2d13950d682b': Make immersive mode public & imply update locking