Merge "Fixing NPE in CursorLoader"