Merge "Don't create StateTrackers for whitelisted atoms" into rvc-dev