Merge "Add PreferenceIconProvider to support dynamic preference icon" into main