Merge "Display provider icon to inline suggestion" into main