Merge changes from topic "fix-mr2-scanning" into main

* changes:
  Fix cancelScanRequest() scanning state update logic
  Make manager scans populate active scanning packages