Merge "Remove background scanning" into jb-dev