Merge "Add some logs to help debug a NotificationAssistant issue"