Merge "Fix a newer race condition in QSIconViewImpl" into main