Merge "Fix NPE when record histoy"