Merge "Fix icon update race condition" into main