Merge "Resizes shaped icons based on selected shape" into main