Merge "Address linguistic bugs, Add locked provider chips to secondary screen as well" into main