Merge "Deflake ActivityWindowInfo tests" into main