Merge "ContextHubTestModeManager: Improve reliable message testing" into main