Merge "Store rule icon res name" into main