Merge "Fix TestLooper to work with CombinedMessageQueue" into main