Merge "Revert^2 "ContextHubTestModeManager: Improve reliable message testing"" into main