Merge "Override on WindowToken if necessary" into main