Merge "Start using @AssistedFactory in Notifications"