Merge "Do not remove toast window token without removing window" into udc-dev