workspace: Activate a window also if it's already in workspace

meta_workspace_activate_with_focus is supposed to focus the passed window after switching the workspace.

However if the passed workspace is already the active one, we just return without activating the window. So fix this calling meta_window_activate on the foucs_this window if that is valid.