Merge "Fix unit tests due to icons with flag on" into main