Merge "Add EllipseOverlapDetectorTest" into tm-qpr-dev