Merge "Fix random crash in libhwui"