Merge "In NotificationRecord, clean out adjustments once they've been applied."