Merge "Handle state management of repository state to remove freeform windows...

Merge "Handle state management of repository state to remove freeform windows without requiring the caller to know the right order of methods to call." into main