Merge "fix race condition between HWUI cache and renderThread"