Merge "Ensure text-controller returns false when it doesn't use key." into devel...