Merge "Simplifications for shelf_action_chip" into main