Merge "Skip sleep-token when switching display which will be on" into 24D1-dev