Merge "Update screenshot shelf actions layout" into main