Merge "Generalize userproperties to support for more user types in iconCache" into main