Waiting screen breaks connection
Revert "Waiting screen breaks connection"

This reverts commit b4571e42ab51778bc157b800e4d84a97f0b586b0.
Revert "Revert "Waiting screen breaks connection""

This reverts commit 739ce0559c9f916917528434e46f5d282c400aeb.
nothing much