Merge "Clean up outdated path of sleep token for swapping display" into main