Merge "NIU Actions: Handle null default assistant"