Merge "Fix possible NPE in LsUserRefs"