Merge "Track user update of rule icon" into main