Merge "Remove notification actions when snoozed" into sc-dev