Merge "Fix DeadObjectException of the spell checker"