Merge changes Ibb8af342,I085b6aeb

* changes:
  Add test for touch spots not cleared when config is disabled
  Fix spot not disappear in some case