Merge "Fix potential NPE when ActivityClientRecord is null"