Merge "Remove use of ATOMIC_VAR_INIT." into main