Merge "Use Flag instead of method check to detect new message queue testability API" into main