Merge "Return empty scan results for background user" into jb-mr1-dev