Merge "clean up scanresults on exit from driver start state"