Merge "Simplify code flow for add starting window." into main