Merge "Fix NPE when using VisibilityLogger."