Merge "Fix crash when SimpleCursorAdapter changes cursor from null" into jb-dev