Merge "Add support for background scanning"