Fix for screen blanking issue

Only intended change was in Socketserver for the screen blanking issue. The other changes was just a rebase to latest