Merge "Run TaskDisplayArea recovery during sleep tokens" into udc-qpr-dev