remove obsolete stub screen, new is in stub_screen branch
Merge branch 'master' into stub_screen