Merge "Fix "Welcome back Guest" dialog dismisses when screen turns off." into tm-dev