Re-add listening for screen state, last version was unusable