Merge "Support dynamic injected preference icons from raw data" into main