Merge "Fix debugging for hwui caches"