Merge "Ensure that inactive archived icons in the folder preview are not shown as grey pending icons" into main