Merge "Fix NPE when NotificationEntry can't be found for action tap" into sc-dev