am 70a5967e: am 5c09d605: Merge "Fix CacheBitmap crash issue when using H/W UI rendering"

* commit '70a5967e0bb295f64c99593043f138fdd62365f4':
  Fix CacheBitmap crash issue when using H/W UI rendering