Merge "Refactor WorkspaceTouchListenerUnitTest test." into main