Merge "Introduce a CustomIconCache for editing favorites"