Merge "Maintain separate callbacks for each Context Hub"