Use queue for staging subscriptions

Change-Id: Iadb52e4582a15a05f4500457a85baae29f46698e