Merge "No ally notification action when snoozed" into sc-dev