Merge "Fix a condition to reset the current spell checker" into pi-dev
am: 18f730cc00

Change-Id: If53849072e284f05589804a26caee621305fa797