Merge "Notify user that scans are still active" into jb-mr2-dev