SOC-4034 | [Activity] Removing thread safe handling when creates Activity - backport