Merge "Add back old WindowInfosListenerForTest test api" into main