Fixes #6531 so that folder-based overrides work correctly.

This change queues up messages from Scopes as they are being added and
sends them out once they are fully added.