Merge "Remove StartingWindow or cancel the request to add StartingWindow after all activities have been drawn" into main