Merge "Fix NPE if contactsCursor is null" into klp-dev