am 871bbbd0: Merge "Notify user that scans are still active" into jb-mr2-dev

* commit '871bbbd0d64bab970f7fba228af2779c1fcbcc46':
  Notify user that scans are still active