Merge "Remove waitingToShow of WindowToken" into main