Merge changes from topic "EnableNewTouch"

* changes:
  Make EllipseOverlapDetector configurable
  Enable new touch detection by default on Master