Merge "Fix NPE when cursor is null"