am fe07b9a2: Merge "Tentative fix for mysteriously recycled bitmap"

* commit 'fe07b9a2ab54305de553332d0ab278fdf7158ae4':
  Tentative fix for mysteriously recycled bitmap