Merge "Fix crash issue due to NPE when two calls are merged"