Merge "Revert "Use display awake signal to replace screen-off signal for sleep token.""