Merge "Add placeholder for lock icon in locked provider chip" into main