Merge "Fix a condition to reset the current spell checker" into pi-dev