Merge "Fix CacheBitmap crash issue when using H/W UI rendering"