Merge "ContextHubService: Flag test mode duplication" into main