Add initScreen() methods that run automatically when switching to a screen
Merge origin/master