Merge "Add media provider/scanner tests" into jb-dev