Merge "Make OverviewActions tests more robust, wait for enabled" into sc-dev