Merge "Run TaskDisplayArea recovery during sleep tokens" into main