Fixed issues with WaitingScreen lock/unlock