am 3ed91a81: Merge "Fix race in bitmap decode vs release."

* commit '3ed91a812dc34b1a8a594322aaff5d9df0467d3f':
  Fix race in bitmap decode vs release.