Merge "Remove usage of bugfix flag add_window_token_without_lock" into main