Merge changes Id1b0d965,I331f8ff6 into 24D1-dev

* changes:
  Simplifications for shelf_action_chip
  Update screenshot shelf actions layout