Merge "Update the scale on corner radii on scaled image drawable." into main