Merge "Remove usage of ATOMIC_VAR_INIT." into main