Merge "Fix HWUI Path Cache dangling pointer"