Merge "Speedup query by using a more narrow View. Change the Loader tests to use a Mock-ContentProvider to not change any real data"