Merge "Fix NPE when cursor is null" into lmp-mr1-dev