Merge "Revert "Clear only workspace shortcut / widget related tests"" into sc-v2-dev