Merge "Always use redacted icon for the shelf" into main