[CP Staging] Revert "fix: restore focus after Modal gets hidden"#54125