rearrange Screen methods to represent lifecycle better
Fixes #2517
Merge branch 'master' of https://github.com/libgdx/libgdx