Merge "Improve Baklava detection in TestableLooper" into main