Merge "Add waiting to test to wait for the Workspace to be in Edit mode" into main