Merge "Prevent NotificationIconContainer$3 from retaining NotificationEntry"