Merge "Trim strings added to persistent snoozed notification storage." into tm-dev