Merge "Avoid race of checking screen states and sleep token" into main