Merge "Fix NPE in logActionClick when we were re-fetching the NotificationEntry we already had." into sc-dev