Merge "Adds a timeout for OverviewCommandHelper commands (3/3)" into main