Merge "Cts verifier to prevent force-stop on task removed" into qt-dev