Merge "Add locked provider chip and screen" into main