Merge "Fix a race in spell checker session handling" into pi-dev