Merge "Fix crash from AssistManager"